Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Sat, 13 Mar 2010 11:15:58 +0000 (11:15 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Sat, 13 Mar 2010 11:15:58 +0000 (11:15 +0000)

Trivial merge